From: Keir Fraser <keir.fraser@citrix.com>
Date: Wed, 11 Mar 2009 19:13:47 +0000 (+0000)
Subject: x86 hvm: Fix hvmemul_read_msr().
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~13992^2~113
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22?a=commitdiff_plain;h=740ba63f2b48b5773c9f7b362a52d5de06ca999a;p=xen.git

x86 hvm: Fix hvmemul_read_msr().

Original patch by Christoph Egger <christoph.egger@amd.com>

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
---

diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c
index 1e583bc2dc..6fbce84e90 100644
--- a/xen/arch/x86/hvm/emulate.c
+++ b/xen/arch/x86/hvm/emulate.c
@@ -793,7 +793,7 @@ static int hvmemul_read_msr(
     if ( (rc = hvm_msr_read_intercept(&_regs)) != 0 )
         return rc;
 
-    *val = ((uint64_t)(uint32_t)_regs.edx << 32) || (uint32_t)_regs.eax;
+    *val = ((uint64_t)(uint32_t)_regs.edx << 32) | (uint32_t)_regs.eax;
     return X86EMUL_OKAY;
 }